Improve the docs of the "label" property. (#341730, Kristof Vansant)

2006-12-30  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkaction.c: Improve the docs of the "label"
        property.  (#341730, Kristof Vansant)

svn path=/trunk/; revision=16988

diff --git a/ChangeLog b/ChangeLog
index df44c5fc2b59539ee41149b8611df1985f2037d6..380cdd709e25188627912b99f620cf3174d4a3cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaction.c: Improve the docs of the "label" 
+       property.  (#341730, Kristof Vansant)
+
 2006-12-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_compute_configure_request_size):

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 93be8c442e135426231a997e319ee61783015bd3..5441be1507af12475c025c6ffce65e7faef36fd5 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/tmpl/gtkactiongroup.sgml: Document that action
+       labels may be NULL.
+
 2006-12-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtk-sections.txt: Add gtk_cell_layout_get_cells.

diff --git a/docs/reference/gtk/tmpl/gtkactiongroup.sgml b/docs/reference/gtk/tmpl/gtkactiongroup.sgml
index 17fa43e9409b307e8f7d0400d8045a53ff944020..8f363a0fed05781b09c145eb5bc78240a6af3246 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkactiongroup.sgml
+++ b/docs/reference/gtk/tmpl/gtkactiongroup.sgml
@@ -203,7 +203,8 @@ gtk_action_group_add_actions() to construct actions.
 @stock_id: The stock id for the action, or the name of an icon from the icon 
     theme.
 @label: The label for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain().
+    translation, see gtk_action_group_set_translation_domain(). If @label
+    is %NULL, the label of the stock item with id @stock_id is used.
 @accelerator: The accelerator for the action, in the format understood by 
     gtk_accelerator_parse().
 @tooltip: The tooltip for the action. This field should typically be marked 

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 8c89b61138c06ba2e60fa4528e01be79a61ba69f..5307363db25faaee08e2b80878eb946c66da7c59 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -193,6 +193,14 @@ gtk_action_class_init (GtkActionClass *klass)
                                                        NULL,
                                                        GTK_PARAM_READWRITE | 
                                                        G_PARAM_CONSTRUCT_ONLY));
+
+  /**
+   * GtkAction:label:
+   *
+   * The label used for menu items and buttons that activate
+   * this action. If the label is %NULL, GTK+ uses the stock 
+   * label specified via the stock-id property.
+   */
   g_object_class_install_property (gobject_class,
                                   PROP_LABEL,
                                   g_param_spec_string ("label",